200. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:01 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

200.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/templates/product/viewdetails.phtml2019-12-13 10:13:54 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/templates/product/viewdetails.phtml2021-03-17 02:27:58 +0000

200.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged5406
Changed12
Inserted00
Removed312

200.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

200.4 Active regular expressions

No regular expressions were active.

200.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Copyright Â© 2016 Magento. All rights reserved. 3  * Copyright Â© 2016 Magento. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6  6 
7 // @codingStandardsIgnoreFile 7 // @codingStandardsIgnoreFile
8  8 
9 ?> 9 ?>
10 <?php if ($detailedInfoGroup = $block->getGroupChildNames('detailed_info', 'getChildHtml')):?> 10 <?php if ($detailedInfoGroup = $block->getGroupChildNames('detailed_info', 'getChildHtml')):?>
11 <?php 11 <?php
12     $porto_helper = $this->helper('Smartwave\Porto\Helper\Data'); 12     $porto_helper = $this->helper('Smartwave\Porto\Helper\Data');
13     $_helper = $this->helper('Smartwave\Porto\Helper\Customtabs'); 13     $_helper = $this->helper('Smartwave\Porto\Helper\Customtabs');
14     $product_config = $porto_helper->getConfig('porto_settings/product'); 14     $product_config = $porto_helper->getConfig('porto_settings/product');
15     $static_block_tab = $product_config['custom_block_next_tab'];    
16     $custom_block = $this->getLayout()->createBlock('Magento\Cms\Block\Block');    
17     $_product = \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\Registry::class)->registry('product'); 15     $_product = \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\Registry::class)->registry('product');
18     $page_type = $_product->getData('product_page_type'); 16     $page_type = $_product->getData('product_page_type');
19     if(!$page_type) 17     if(!$page_type)
20         $page_type = isset($_config['product_page_type'])?$_config['product_page_type']:''; 18         $page_type = isset($_config['product_page_type'])?$_config['product_page_type']:'';
21     if($custom_block) {    
22         $custom_block->setBlockId($static_block_tab);    
23     }    
24     $tab_style = ""; 19     $tab_style = "";
25     if(isset($product_config['tab_style']) && $product_config['tab_style']) 20     if(isset($product_config['tab_style']) && $product_config['tab_style'])
26         $tab_style = $product_config['tab_style']; 21         $tab_style = $product_config['tab_style'];
27     if($page_type == 'wide_grid') 22     if($page_type == 'wide_grid')
28         $tab_style = 'vertical'; 23         $tab_style = 'vertical';
29 ?> 24 ?>
30     <?php if($product_config['tab_full_background']):?> 25     <?php if($product_config['tab_full_background']):?>
31     <div class="move-product-tab"> 26     <div class="move-product-tab">
32         <div class="row"> 27         <div class="row">
33             <div class="<?php if(!$page_type && $custom_block && $static_block_tab):?>col-md-9<?php else:?>col-md-12<?php endif;?>"> 28             <div class="col-md-12">
34     <?php endif;?> 29     <?php endif;?>
35                 <div class="product info detailed <?php echo $tab_style; ?> <?php if($page_type == 'sticky_right'): ?>fullwidth-row<?php endif; ?>"> 30                 <div class="product info detailed <?php echo $tab_style; ?> <?php if($page_type == 'sticky_right'): ?>fullwidth-row<?php endif; ?>">
36                 <?php $layout = $block->getLayout(); ?> 31                 <?php $layout = $block->getLayout(); ?>
37                 <?php if(!$tab_style || $tab_style != "sticky"): ?> 32                 <?php if(!$tab_style || $tab_style != "sticky"): ?>
38                     <div class="product data items <?php if($page_type == 'sticky_right'): ?>container<?php endif; ?>" data-mage-init='{"tabs":{"openedState":"active"}}'> 33                     <div class="product data items <?php if($page_type == 'sticky_right'): ?>container<?php endif; ?>" data-mage-init='{"tabs":{"openedState":"active"}}'>
39                         <?php foreach ($detailedInfoGroup as $name):?> 34                         <?php foreach ($detailedInfoGroup as $name):?>
40                             <?php 35                             <?php
41                             $html = $layout->renderElement($name); 36                             $html = $layout->renderElement($name);
42                             if (!trim($html)) { 37                             if (!trim($html)) {
43                                 continue; 38                                 continue;
44                             } 39                             }
45                             $alias = $layout->getElementAlias($name); 40                             $alias = $layout->getElementAlias($name);
46                             $label = $block->getChildData($alias, 'title'); 41                             $label = $block->getChildData($alias, 'title');
47                             ?> 42                             ?>
48                             <div class="data item title" 43                             <div class="data item title"
49                                  aria-labeledby="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>-title" 44                                  aria-labeledby="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>-title"
50                                  data-role="collapsible" id="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>"> 45                                  data-role="collapsible" id="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>">
51                                 <a class="data switch" 46                                 <a class="data switch"
52                                    tabindex="-1" 47                                    tabindex="-1"
53                                    data-toggle="switch" 48                                    data-toggle="switch"
54                                    href="#<?php /* @escapeNotVerified */ echo $alias; ?>" 49                                    href="#<?php /* @escapeNotVerified */ echo $alias; ?>"
55                                    id="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>-title"> 50                                    id="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>-title">
56                                     <span><?php /* @escapeNotVerified */ echo $label; ?></span> 51                                     <span><?php /* @escapeNotVerified */ echo $label; ?></span>
57                                 </a> 52                                 </a>
58                             </div> 53                             </div>
59                             <div class="data item content" id="<?php /* @escapeNotVerified */ echo $alias; ?>" data-role="content"> 54                             <div class="data item content" id="<?php /* @escapeNotVerified */ echo $alias; ?>" data-role="content">
60                                 <?php /* @escapeNotVerified */ echo $html; ?> 55                                 <?php /* @escapeNotVerified */ echo $html; ?>
61                             </div> 56                             </div>
62                         <?php endforeach;?> 57                         <?php endforeach;?>
63                         <?php 58                         <?php
64                         if($custom_cms_tabs = $_helper->getCustomTabs($_product)) { 59                         if($custom_cms_tabs = $_helper->getCustomTabs($_product)) {
65                             $i = 1; 60                             $i = 1;
66                             foreach($custom_cms_tabs as $_item) { 61                             foreach($custom_cms_tabs as $_item) {
67                                 ?> 62                                 ?>
68                                 <div class="data item title" 63                                 <div class="data item title"
69                                      aria-labeledby="tab-label-<?php /* @escapeNotVerified */ echo "custom-".$i;?>-title" 64                                      aria-labeledby="tab-label-<?php /* @escapeNotVerified */ echo "custom-".$i;?>-title"
70                                      data-role="collapsible" id="tab-label-<?php /* @escapeNotVerified */ echo "custom-".$i;?>"> 65                                      data-role="collapsible" id="tab-label-<?php /* @escapeNotVerified */ echo "custom-".$i;?>">
71                                     <a class="data switch" 66                                     <a class="data switch"
72                                        tabindex="-1" 67                                        tabindex="-1"
73                                        data-toggle="switch" 68                                        data-toggle="switch"
74                                        href="#<?php /* @escapeNotVerified */ echo "custom-".$i; ?>" 69                                        href="#<?php /* @escapeNotVerified */ echo "custom-".$i; ?>"
75                                        id="tab-label-<?php /* @escapeNotVerified */ echo "custom-".$i;?>-title"> 70                                        id="tab-label-<?php /* @escapeNotVerified */ echo "custom-".$i;?>-title">
76                                         <span><?php /* @escapeNotVerified */ echo $_item['tab_title']; ?></span> 71                                         <span><?php /* @escapeNotVerified */ echo $_item['tab_title']; ?></span>
77                                     </a> 72                                     </a>
78                                 </div> 73                                 </div>
79                                 <div class="data item content" id="<?php /* @escapeNotVerified */ echo "custom-".$i; ?>" data-role="content"> 74                                 <div class="data item content" id="<?php /* @escapeNotVerified */ echo "custom-".$i; ?>" data-role="content">
80                                     <?php /* @escapeNotVerified */ echo $_item['tab_content']; ?> 75                                     <?php /* @escapeNotVerified */ echo $_item['tab_content']; ?>
81                                 </div> 76                                 </div>
82                                 <?php 77                                 <?php
83                                 $i++; 78                                 $i++;
84                             } 79                             }
85                         } 80                         }
86                         ?> 81                         ?>
87                     </div> 82                     </div>
88                 <?php elseif($tab_style && $tab_style == "sticky"): ?> 83                 <?php elseif($tab_style && $tab_style == "sticky"): ?>
89                     <div class="product data items" data-mage-init='{"tabs":{"openedState":"active"}}'> 84                     <div class="product data items" data-mage-init='{"tabs":{"openedState":"active"}}'>
90                         <?php foreach ($detailedInfoGroup as $name):?> 85                         <?php foreach ($detailedInfoGroup as $name):?>
91                             <?php 86                             <?php
92                             $html = $layout->renderElement($name); 87                             $html = $layout->renderElement($name);
93                             if (!trim($html)) { 88                             if (!trim($html)) {
94                                 continue; 89                                 continue;
95                             } 90                             }
96                             $alias = $layout->getElementAlias($name); 91                             $alias = $layout->getElementAlias($name);
97                             $label = $block->getChildData($alias, 'title'); 92                             $label = $block->getChildData($alias, 'title');
98                             $alias = str_replace(".","_",$alias); 93                             $alias = str_replace(".","_",$alias);
99                             ?> 94                             ?>
100                             <div class="data item title <?php if($alias == 'reviews'):?>active<?php endif; ?>" aria-labeledby="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>" 95                             <div class="data item title <?php if($alias == 'reviews'):?>active<?php endif; ?>" aria-labeledby="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>"
101                             data-role="collapsible" id="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>"> 96                             data-role="collapsible" id="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>">
102                                 <a class="data switch" href="#<?php /* @escapeNotVerified */ echo $alias; ?>"> 97                                 <a class="data switch" href="#<?php /* @escapeNotVerified */ echo $alias; ?>">
103                                     <?php /* @escapeNotVerified */ echo $label; ?> 98                                     <?php /* @escapeNotVerified */ echo $label; ?>
104                                 </a> 99                                 </a>
105                             </div> 100                             </div>
106                         <?php endforeach;?> 101                         <?php endforeach;?>
107                         <?php 102                         <?php
108                         if($custom_cms_tabs = $_helper->getCustomTabs($_product)) { 103                         if($custom_cms_tabs = $_helper->getCustomTabs($_product)) {
109                             $i = 1; 104                             $i = 1;
110                             foreach($custom_cms_tabs as $_item) { 105                             foreach($custom_cms_tabs as $_item) {
111                                 ?> 106                                 ?>
112                                 <div class="data item title active"> 107                                 <div class="data item title active">
113                                     <a class="data switch" href="#<?php /* @escapeNotVerified */ echo "custom-".$i; ?>"> 108                                     <a class="data switch" href="#<?php /* @escapeNotVerified */ echo "custom-".$i; ?>">
114                                         <?php /* @escapeNotVerified */ echo $_item['tab_title']; ?> 109                                         <?php /* @escapeNotVerified */ echo $_item['tab_title']; ?>
115                                     </a> 110                                     </a>
116                                 </div> 111                                 </div>
117                                 <?php 112                                 <?php
118                                 $i++; 113                                 $i++;
119                             } 114                             }
120                         } 115                         }
121                         ?> 116                         ?>
122                         <?php foreach ($detailedInfoGroup as $name):?> 117                         <?php foreach ($detailedInfoGroup as $name):?>
123                             <?php 118                             <?php
124                             $html = $layout->renderElement($name); 119                             $html = $layout->renderElement($name);
125                             if (!trim($html)) { 120                             if (!trim($html)) {
126                                 continue; 121                                 continue;
127                             } 122                             }
128                             $alias = $layout->getElementAlias($name); 123                             $alias = $layout->getElementAlias($name);
129                             $label = $block->getChildData($alias, 'title'); 124                             $label = $block->getChildData($alias, 'title');
130                             $alias = str_replace(".","_",$alias); 125                             $alias = str_replace(".","_",$alias);
131                             ?> 126                             ?>
132                             <div class="data item content" id="<?php /* @escapeNotVerified */ echo $alias; ?>"> 127                             <div class="data item content" id="<?php /* @escapeNotVerified */ echo $alias; ?>">
133                                 <?php /* @escapeNotVerified */ echo $html; ?> 128                                 <?php /* @escapeNotVerified */ echo $html; ?>
134                             </div> 129                             </div>
135                         <?php endforeach;?> 130                         <?php endforeach;?>
136                         <?php 131                         <?php
137                         if($custom_cms_tabs = $_helper->getCustomTabs($_product)) { 132                         if($custom_cms_tabs = $_helper->getCustomTabs($_product)) {
138                             $i = 1; 133                             $i = 1;
139                             foreach($custom_cms_tabs as $_item) { 134                             foreach($custom_cms_tabs as $_item) {
140                                 ?> 135                                 ?>
141                                 <div class="data item content" id="<?php /* @escapeNotVerified */ echo "custom-".$i; ?>"> 136                                 <div class="data item content" id="<?php /* @escapeNotVerified */ echo "custom-".$i; ?>">
142                                     <?php /* @escapeNotVerified */ echo $_item['tab_content']; ?> 137                                     <?php /* @escapeNotVerified */ echo $_item['tab_content']; ?>
143                                 </div> 138                                 </div>
144                                 <?php 139                                 <?php
145                                 $i++; 140                                 $i++;
146                             } 141                             }
147                         } 142                         }
148                         ?> 143                         ?>
149                     </div> 144                     </div>
150                 <?php endif; ?> 145                 <?php endif; ?>
151                 <script type="text/javascript"> 146                 <script type="text/javascript">
152                     require([ 147                     require([
153                         'jquery' 148                         'jquery'
154                     ], function ($) { 149                     ], function ($) {
155                         $(document).ready(function(){ 150                         $(document).ready(function(){
156                             <?php if($tab_style && $tab_style == "vertical"): ?> 151                             <?php if($tab_style && $tab_style == "vertical"): ?>
157                             $(".product.info.detailed.vertical .product.data.items .data.item.title").off("classadded").on("classadded",function(){ 152                             $(".product.info.detailed.vertical .product.data.items .data.item.title").off("classadded").on("classadded",function(){
158                                 $(this).parent().css("min-height",$(this).next().outerHeight()+"px"); 153                                 $(this).parent().css("min-height",$(this).next().outerHeight()+"px");
159                             }); 154                             });
160                             <?php elseif($tab_style && $tab_style == "sticky"): ?> 155                             <?php elseif($tab_style && $tab_style == "sticky"): ?>
161                             var sticky_tabs; 156                             var sticky_tabs;
162                             var is_sticky = false; 157                             var is_sticky = false;
163                             $(window).scroll(function(){ 158                             $(window).scroll(function(){
164                                 if($(window).scrollTop() >= $(".product.info.detailed").offset().top-50){ 159                                 if($(window).scrollTop() >= $(".product.info.detailed").offset().top-50){
165                                     if(!is_sticky){ 160                                     if(!is_sticky){
166                                         $(".product.info.detailed.sticky").before('<div class="product-tabs-container"><div class="container"></div></div>'); 161                                         $(".product.info.detailed.sticky").before('<div class="product-tabs-container"><div class="container"></div></div>');
167                                         $(".product.info.detailed.sticky .product.data.items > .item.title").each(function(){ 162                                         $(".product.info.detailed.sticky .product.data.items > .item.title").each(function(){
168                                             $(".product-tabs-container > .container").append($(this).clone().detach()); 163                                             $(".product-tabs-container > .container").append($(this).clone().detach());
169                                         }); 164                                         });
170                                         $(".product-tabs-container .item.title > a").off("click").on("click", function(){ 165                                         $(".product-tabs-container .item.title > a").off("click").on("click", function(){
171                                             $($(this).attr("href")).scrollToMe(); 166                                             $($(this).attr("href")).scrollToMe();
172                                             return false; 167                                             return false;
173                                         }); 168                                         });
174                                         <?php if ($porto_helper->getConfig('porto_settings/header/sticky_header')): ?> 169                                         <?php if ($porto_helper->getConfig('porto_settings/header/sticky_header')): ?>
175                                         $(".product-tabs-container").addClass("has-sticky-header"); 170                                         $(".product-tabs-container").addClass("has-sticky-header");
176                                         <?php endif; ?> 171                                         <?php endif; ?>
177                                         <?php if ($porto_helper->getConfig('porto_settings/header/mobile_sticky_header')): ?> 172                                         <?php if ($porto_helper->getConfig('porto_settings/header/mobile_sticky_header')): ?>
178                                         $(".product-tabs-container").addClass("has-mobile-sticky-header"); 173                                         $(".product-tabs-container").addClass("has-mobile-sticky-header");
179                                         <?php endif; ?> 174                                         <?php endif; ?>
180                                         is_sticky = true; 175                                         is_sticky = true;
181                                     } 176                                     }
182                                 } else { 177                                 } else {
183                                     $(".product-tabs-container").remove(); 178                                     $(".product-tabs-container").remove();
184                                     is_sticky = false; 179                                     is_sticky = false;
185                                 } 180                                 }
186                             }); 181                             });
187                             $(".product.info.detailed.sticky .product.data.items > .item.title > a").off("click").on("click", function(){ 182                             $(".product.info.detailed.sticky .product.data.items > .item.title > a").off("click").on("click", function(){
188                                 $($(this).attr("href")).scrollToMe(); 183                                 $($(this).attr("href")).scrollToMe();
189                                 return false; 184                                 return false;
190                             }); 185                             });
191                             $(".product-reviews-summary .reviews-actions a.action.view").off("click").on("click", function(){ 186                             $(".product-reviews-summary .reviews-actions a.action.view").off("click").on("click", function(){
192                                 $("#reviews").scrollToMe(); 187                                 $("#reviews").scrollToMe();
193                                 return false; 188                                 return false;
194                             }); 189                             });
195                             $(".product-reviews-summary .reviews-actions a.action.add").off("click").on("click", function(){ 190                             $(".product-reviews-summary .reviews-actions a.action.add").off("click").on("click", function(){
196                                 $("#review-form").scrollToMe(); 191                                 $("#review-form").scrollToMe();
197                                 return false; 192                                 return false;
198                             }); 193                             });
199                             <?php endif; ?> 194                             <?php endif; ?>
200                         }); 195                         });
201                     }); 196                     });
202                 </script> 197                 </script>
203                 </div> 198                 </div>
204     <?php if($product_config['tab_full_background']):?> 199             <?php if($product_config['tab_full_background']):?>
205             </div> 200             </div>
206             <?php if(!$page_type && $custom_block && $static_block_tab):?>    
207             <div class="col-md-3">    
208                 <div class="custom-block-tab">    
209                     <?php echo $custom_block->toHtml(); ?>    
210                 </div>    
211             </div>    
212             <?php endif;?>    
213         </div> 201         </div>
214     </div> 202     </div>
215     <?php endif;?> 203     <?php endif;?>
216 <?php endif; ?> 204 <?php endif; ?>